From dfebf60e68c08617e2be864b202f3dafb25f58df Mon Sep 17 00:00:00 2001 From: James Turner Date: Sun, 3 Mar 2013 16:01:06 +0000 Subject: [PATCH] Simplify CMakeLists now package code is enabled. --- CMakeLists.txt | 7 ------- simgear/CMakeLists.txt | 5 +---- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 00ff37b3..5ae77c47 100644 --- 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 78dad8c7..ca49747a 100644 --- 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) -- 2.39.5