Move BUILD_STATIC_LIBRARIES option to toplevel CMakeLists.txt

smlee-hdactech · Jun 7, 2013 · cbecf60 · cbecf60
1 parent 573c13a
commit cbecf60
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,6 +4,8 @@ PROJECT(json_spirit)
 SUBDIRS(json_spirit json_demo json_headers_only_demo json_test)
 INCLUDE_DIRECTORIES(json_spirit)
 
+OPTION(BUILD_STATIC_LIBRARIES "Build static libraries" OFF)
+
 OPTION(JSON_SPIRIT_WVALUE_ENABLED "Build with support for unicode types" OFF)
 OPTION(JSON_SPIRIT_MVALUE_ENABLED "Build with support for ascii map types" OFF)
 OPTION(JSON_SPIRIT_WMVALUE_ENABLED "Build with support for unicode map types" OFF)

diff --git a/json_spirit/CMakeLists.txt b/json_spirit/CMakeLists.txt
@@ -13,8 +13,6 @@ json_spirit_writer_template.h )
 FIND_PACKAGE(Boost 1.34 REQUIRED)
 INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIR})
 
-OPTION(BUILD_STATIC_LIBRARIES "Build static libraries" OFF)
-
 if(BUILD_STATIC_LIBRARIES)
   ADD_LIBRARY(json_spirit STATIC ${JSON_SPIRIT_SRCS})
   install(TARGETS json_spirit ARCHIVE DESTINATION lib)