ankursinha / rpms / moose

Forked from rpms/moose 4 years ago
Clone
Blob Blame History Raw
From d1ffaa23c81a560240871e1ba0877f0651b80070 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Fri, 11 Dec 2015 11:20:45 -0500
Subject: [PATCH] Make libmoose static for now

The transition to a shared lib doesn't seem to be ready yet.
---
 CMakeLists.txt | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4913aa21e2..8f82cee665 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -205,7 +205,7 @@ endif()
 include_directories(msg basecode)
 add_executable(moose.bin basecode/main.cpp)
 
-add_library(libmoose SHARED basecode/main.cpp)
+add_library(libmoose STATIC basecode/main.cpp)
 set_target_properties(libmoose PROPERTIES COMPILE_FLAGS  "-DMOOSE_LIB")
 set_target_properties(libmoose PROPERTIES PREFIX "")
 
@@ -445,16 +445,7 @@ ELSE(MACOSX)
         )
 ENDIF(MACOSX)
 
-add_dependencies(moose.bin libmoose)
-
-IF(CMAKE_VERSION VERSION_LESS "2.8.0")
-    MESSAGE(STATUS "Using a fix for cmake ( < 2.8)")
-    target_link_libraries(moose.bin PUBLIC moose) 
-ELSE()
-    target_link_libraries(moose.bin
-        LINK_PUBLIC moose
-        )
-ENDIF()
+target_link_libraries(moose.bin libmoose)
 
 IF(WITH_DOC)
     FIND_PACKAGE(Doxygen REQUIRED)