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.

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,7 +373,12 @@ if(ENABLE_TESTS)
 
     include (Dart)
     enable_testing()
+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)
@@ -392,9 +398,6 @@ if(ENABLE_TESTS)
         ${TEST_LIBS}
         ${OPENGL_LIBRARIES})
 endif()
-else()
-    message(STATUS "Tests: DISABLED")
-endif(ENABLE_TESTS)
 
 install (FILES ${PROJECT_BINARY_DIR}/simgear/simgear_config.h  DESTINATION include/simgear/)
 add_subdirectory(simgear)

simgear/package/CMakeLists.txt

@@ -22,10 +22,7 @@ set(SOURCES
 
 simgear_component(package package "${SOURCES}" "${HEADERS}")
 
+if(ENABLE_PKGUTIL)
   add_executable(sg_pkgutil pkgutil.cxx)
   target_link_libraries(sg_pkgutil ${TEST_LIBS})
-
-if(ENABLE_TESTS)
-
-
-endif(ENABLE_TESTS)
+endif()