Simplify CMakeLists now package code is enabled.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 00ff37b30f317e800122f92f2e7f3cd9c42261a3..5ae77c47981412fec329e57e81b9748c66bd5ab9 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -112,7 +112,6 @@ 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_PACKAGE   "Set to ON to build package-management support" ON)
 
 if (MSVC)
   GET_FILENAME_COMPONENT(PARENT_DIR ${PROJECT_SOURCE_DIR} PATH)
@@ -224,12 +223,6 @@ else()
     add_definitions(-DHAVE_EXPAT_CONFIG_H)
 endif(SYSTEM_EXPAT)
 
-if (ENABLE_PACKAGE)
-    message(STATUS "package management: ENABLED")
-else()
-    message(STATUS "package management: DISABLED")
-endif(ENABLE_PACKAGE)
-
 check_include_file(inttypes.h HAVE_INTTYPES_H)
 check_include_file(sys/time.h HAVE_SYS_TIME_H)
 check_include_file(sys/timeb.h HAVE_SYS_TIMEB_H)

diff --git a/simgear/CMakeLists.txt b/simgear/CMakeLists.txt
index 78dad8c7b80766396caf1a26f881f608a7dabd70..ca49747a2ad2a562792354d049d99662ee85f0b5 100644 (file)
--- a/simgear/CMakeLists.txt
+++ b/simgear/CMakeLists.txt
@@ -18,16 +18,13 @@ foreach( mylibfolder
         threads
         timing
         xml
+        package
     )
 
     add_subdirectory(${mylibfolder})
 
 endforeach( mylibfolder )
 
-if (ENABLE_PACKAGE)
-    add_subdirectory(package)
-endif(ENABLE_PACKAGE)
-
 if(NOT SIMGEAR_HEADLESS)
     add_subdirectory(canvas)
     add_subdirectory(environment)