From c5df95d5a93853c29e8fd3056f52ea8eb318b91e Mon Sep 17 00:00:00 2001
From: Andrey Kamaev <no@email>
Date: Fri, 15 Jun 2012 07:52:20 +0000
Subject: [PATCH] Shortened cmake script for opencv_world
---
modules/world/CMakeLists.txt | 31 ++++++++++---------------------
1 file changed, 10 insertions(+), 21 deletions(-)
diff --git a/modules/world/CMakeLists.txt b/modules/world/CMakeLists.txt
index 1530cc8d9..a75037cfc 100644
--- a/modules/world/CMakeLists.txt
+++ b/modules/world/CMakeLists.txt
@@ -1,12 +1,12 @@
set(the_description "All the selected OpenCV modules in a single binary")
set(OPENCV_MODULE_IS_PART_OF_WORLD FALSE)
set(BUILD_opencv_world_INIT OFF)
-if(IOS)
-set(BUILD_WORLD_AS_STATIC 1)
-endif()
-if(NOT BUILD_WORLD_AS_STATIC)
-set(OPENCV_MODULE_TYPE SHARED)
+if(IOS OR NOT BUILD_SHARED_LIBS)
+ set(OPENCV_MODULE_TYPE STATIC)
+ set(OPENCV_WORLD_FLAGS_PROPERTY STATIC_LIBRARY_FLAGS)
+else()
+ set(OPENCV_WORLD_FLAGS_PROPERTY LINK_FLAGS)
endif()
ocv_add_module(world opencv_core)
@@ -85,25 +85,14 @@ string(REPLACE ";" " " objlist "${objlist}")
if(have_cfg)
string(REGEX REPLACE "<CONFIGURATION>" "Debug" objlist_dbg "${objlist}")
string(REGEX REPLACE "<CONFIGURATION>" "Release" objlist_rls "${objlist}")
- if(BUILD_WORLD_AS_STATIC)
- set_target_properties(${the_module} PROPERTIES
- STATIC_LIBRARY_FLAGS_DEBUG ${objlist_dbg}
- STATIC_LIBRARY_FLAGS_RELEASE ${objlist_rls})
- else()
- set_target_properties(${the_module} PROPERTIES
- LINK_FLAGS_DEBUG ${objlist_dbg}
- LINK_FLAGS_RELEASE ${objlist_rls})
- endif()
+ set_target_properties(${the_module} PROPERTIES
+ ${OPENCV_WORLD_FLAGS_PROPERTY}_DEBUG ${objlist_dbg}
+ ${OPENCV_WORLD_FLAGS_PROPERTY}_RELEASE ${objlist_rls})
else()
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/world_objects.list" "${objlist}")
execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_BINARY_DIR}/world_objects.list" "${CMAKE_CURRENT_BINARY_DIR}/world_objects.rsp" OUTPUT_QUIET)
- if(BUILD_WORLD_AS_STATIC)
- set_target_properties(${the_module} PROPERTIES
- STATIC_LIBRARY_FLAGS "@${CMAKE_CURRENT_BINARY_DIR}/world_objects.rsp")
- else()
- set_target_properties(${the_module} PROPERTIES
- LINK_FLAGS "@${CMAKE_CURRENT_BINARY_DIR}/world_objects.rsp")
- endif()
+ set_target_properties(${the_module} PROPERTIES
+ ${OPENCV_WORLD_FLAGS_PROPERTY} "@${CMAKE_CURRENT_BINARY_DIR}/world_objects.rsp")
endif()
ocv_add_precompiled_headers(${the_module})