[scram] 01/01: Disable installation of the libscramcore

[Olzhas Rakhimov]

This is an automated email from the git hooks/post-receive script.

rakhimov-guest pushed a commit to branch cmake
in repository scram.

commit 7ab531d8de29d0746709f3e4f99f943532ea8d50
Author: rakhimov <ol.rakhimov at gmail.com>
Date:   Thu Nov 17 08:59:51 2016 -0800

    Disable installation of the libscramcore
    
    This should've been an option instead of setting.
    The shared library is not necessary at this stage.
---
 CMakeLists.txt     |  4 ++--
 src/CMakeLists.txt | 40 ++++++++++++++++++++--------------------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8ae6226..e79e952 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@ set(SCRAM_VERSION_MICRO 4)  # Bug fixes.
 
 ####################### Begin Options ###################
 
-set(BUILD_SHARED_LIBS TRUE)  # Change this for static building.
+set(BUILD_SHARED_LIBS FALSE)  # Change this for static building.
 
 # Linking of external libraries, such as BOOST.
 option(WITH_STATIC_LIBS "Try to link against static libraries" OFF)
@@ -118,7 +118,7 @@ set(CMAKE_SKIP_BUILD_RPATH FALSE)
 # (but later on when installing).
 set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
 
-set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+# set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
 
 # Add the automatically determined parts of the RPATH,
 # which point to directories outside the build tree
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5c6000c..d33b34d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -54,29 +54,29 @@ set(SCRAM_CORE_SRC
   )
 add_library(scramcore ${SCRAM_CORE_SRC})
 
-set_target_properties(scramcore
-  PROPERTIES
-  INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib"
-  INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib"
-  LINK_FLAGS "${LIB_LINK_FLAGS}"
-  )
+# set_target_properties(scramcore
+#   PROPERTIES
+#   INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib"
+#   INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib"
+#   LINK_FLAGS "${LIB_LINK_FLAGS}"
+#   )
 
 target_link_libraries(scramcore ${LIBS})
 
-if(WIN32)
-  install(
-    TARGETS scramcore
-    RUNTIME DESTINATION bin COMPONENT scram
-    LIBRARY DESTINATION lib COMPONENT scram
-    ARCHIVE DESTINATION lib COMPONENT scram
-    )
-else()
-  install(
-    TARGETS scramcore
-    DESTINATION lib
-    COMPONENT scram
-    )
-endif()
+# if(WIN32)
+#   install(
+#     TARGETS scramcore
+#     RUNTIME DESTINATION bin COMPONENT scram
+#     LIBRARY DESTINATION lib COMPONENT scram
+#     ARCHIVE DESTINATION lib COMPONENT scram
+#     )
+# else()
+#   install(
+#     TARGETS scramcore
+#     DESTINATION lib
+#     COMPONENT scram
+#     )
+# endif()
 
 add_executable(scram scram.cc)
 target_link_libraries(scram scramcore ${Boost_LIBRARIES})

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/scram.git