Fix #1139

Always set TEST_LIBS as applications/tools also need to link
them, even if tests are disabled. Also allow disabling building
of sg_pkgutil.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f25cf760535bb6b777a5ee729358aa20084d10d3..4ed9e8522e064c80d8174fff2e9763fec41a1ac9 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -113,6 +113,7 @@ option(ENABLE_LIBSVN    "Set to ON to build SimGear with libsvnclient support" O
 option(ENABLE_RTI       "Set to ON to build SimGear with RTI support" OFF)
 option(ENABLE_TESTS     "Set to OFF to disable building SimGear's test applications" ON)
 option(ENABLE_SOUND     "Set to OFF to disable building SimGear's sound support" ON)
+option(ENABLE_PKGUTIL   "Set to ON to build the sg_pkgutil application (default)" ON)
 
 if (MSVC)
   GET_FILENAME_COMPONENT(PARENT_DIR ${PROJECT_BINARY_DIR} PATH)
@@ -372,30 +373,32 @@ if(ENABLE_TESTS)
 
     include (Dart)
     enable_testing()
-
-    if(SIMGEAR_SHARED)
-        set( TEST_LIBS
-            SimGearCore)
-    else()
-        set( TEST_LIBS
-            SimGearCore
-            ${CMAKE_THREAD_LIBS_INIT}
-            ${ZLIB_LIBRARY}
-            ${WINSOCK_LIBRARY}
-            ${RT_LIBRARY}
-            ${CORE_SERVICES_LIBRARY})
-    endif()
-
-    if(NOT SIMGEAR_HEADLESS)
-        set( TEST_LIBS
-            SimGearScene
-            ${TEST_LIBS}
-            ${OPENGL_LIBRARIES})
-    endif()
 else()
     message(STATUS "Tests: DISABLED")
 endif(ENABLE_TESTS)
 
+# always set TEST_LIBS as it is also used by other tools/applications
+# TODO maybe better rename?
+if(SIMGEAR_SHARED)
+    set( TEST_LIBS
+        SimGearCore)
+else()
+    set( TEST_LIBS
+        SimGearCore
+        ${CMAKE_THREAD_LIBS_INIT}
+        ${ZLIB_LIBRARY}
+        ${WINSOCK_LIBRARY}
+        ${RT_LIBRARY}
+        ${CORE_SERVICES_LIBRARY})
+endif()
+
+if(NOT SIMGEAR_HEADLESS)
+    set( TEST_LIBS
+        SimGearScene
+        ${TEST_LIBS}
+        ${OPENGL_LIBRARIES})
+endif()
+
 install (FILES ${PROJECT_BINARY_DIR}/simgear/simgear_config.h  DESTINATION include/simgear/)
 add_subdirectory(simgear)
 

diff --git a/simgear/package/CMakeLists.txt b/simgear/package/CMakeLists.txt
index 1822205c1a9a5a90a31e5333abb61680b53b9280..03178960885f036e93dcdcce880cc610130a5d61 100644 (file)
--- a/simgear/package/CMakeLists.txt
+++ b/simgear/package/CMakeLists.txt
@@ -22,10 +22,7 @@ set(SOURCES
 
 simgear_component(package package "${SOURCES}" "${HEADERS}")
 
-add_executable(sg_pkgutil pkgutil.cxx)
-target_link_libraries(sg_pkgutil ${TEST_LIBS})
-
-if(ENABLE_TESTS)
-
-
-endif(ENABLE_TESTS)
+if(ENABLE_PKGUTIL)
+  add_executable(sg_pkgutil pkgutil.cxx)
+  target_link_libraries(sg_pkgutil ${TEST_LIBS})
+endif()