diff --git a/packages/CLPBN/horus/CMakeLists.txt b/packages/CLPBN/horus/CMakeLists.txt index 2741ee32f..06354ad25 100644 --- a/packages/CLPBN/horus/CMakeLists.txt +++ b/packages/CLPBN/horus/CMakeLists.txt @@ -69,4 +69,5 @@ install(TARGETS horus HorusCli RUNTIME DESTINATION ${bindir} LIBRARY DESTINATION ${dlls} + ARCHIVE DESTINATION ${dlls} ) diff --git a/packages/bdd/CMakeLists.txt b/packages/bdd/CMakeLists.txt index 3a3c29b2d..ea475c490 100644 --- a/packages/bdd/CMakeLists.txt +++ b/packages/bdd/CMakeLists.txt @@ -67,6 +67,8 @@ IF (CUDD_FOUND) install(TARGETS cudd LIBRARY DESTINATION ${dlls} + ARCHIVE DESTINATION ${dlls} + ) INSTALL(FILES bdd.yap DESTINATION ${libpl}) diff --git a/packages/cplint/CMakeLists.txt b/packages/cplint/CMakeLists.txt index 2f0964c5c..1004c38be 100644 --- a/packages/cplint/CMakeLists.txt +++ b/packages/cplint/CMakeLists.txt @@ -168,6 +168,7 @@ IF (CUDD_FOUND_EXPORT) install(TARGETS cplint LIBRARY DESTINATION ${dlls} + ARCHIVE DESTINATION ${dlls} ) INSTALL(FILES ${CPLINT_PROGRAMS} DESTINATION ${libpl}) diff --git a/packages/real/CMakeLists.txt b/packages/real/CMakeLists.txt index 000992097..87f876235 100644 --- a/packages/real/CMakeLists.txt +++ b/packages/real/CMakeLists.txt @@ -3,11 +3,11 @@ PROJECT ( YAP_REAL C ) macro_optional_find_package (R ON) - macro_log_feature (R_HOME "R" + macro_log_feature (R_FOUND "R" "Use R Environment" "http://www.r.org" FALSE) -if (R_HOME) +if (R_FOUND) set (REAL_SOURCES real.c @@ -25,14 +25,12 @@ include_directories ( ) - #R_COMMAND - Path to R command - # R_HOME - Path to 'R home', as reported by R - # R_INCLUDE_DIR - Path to R include directory - # R_LIBRARY_BASE - Path to R library - # R_LIBRARY_BLAS - Path to Rblas / blas library - # R_LIBRARY_LAPACK - Path to Rlapack / lapack library - # R_LIBRARY_READLINE - Path to readline library - # R_LIBRARIES - Array of: R_LIBRARY_BASE, R_LIBRARY_BLAS, R_LIBRARY_LAPACK, R_LIBRARY_BASE [, R_LIBRARY_READLINE] +# The module defines the following variables: +# R_FOUND - System has R +# R_EXECUTABLE - The R interpreter +# R_INCLUDE_DIR - the R include directory +# R_LIBRARIES - The libraries needed to use R +# R_VERSION_STRING - R version add_library (real SHARED ${REAL_SOURCES}) @@ -48,6 +46,7 @@ include_directories ( install(TARGETS real LIBRARY DESTINATION ${dlls} + ARCHIVE DESTINATION ${dlls} ) install(FILES real.pl @@ -55,4 +54,4 @@ include_directories ( ) -endif (R_HOME) +endif (R_FOUND)