Install in share/creaNewProject, not in share/creaNewProject_data

[crea.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ab5e89633c06b9b89600a3cd6289edd46dd34542..90b53c5d6bfb1461591608c5061f02017380ea03 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,13 +37,7 @@ CREA_FIND_AND_USE_LIBRARIES()
 
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR})
 SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR})
-IF (WIN32)
-  SET(CREA_LIB_PATH bin)
-ELSE (WIN32)
-  SET(CREA_LIB_PATH lib)
-ENDIF(WIN32)
-
-
+SET(CREA_LIB_PATH ${CMAKE_CREA_LIB_PATH} )
 
 MARK_AS_ADVANCED(
   CMAKE_BACKWARDS_COMPATIBILITY
@@ -61,19 +55,19 @@ OPTION ( CREA_COMPILE_WARNING_MESSAGES "Compile CREA warning messages ?" ON)
 
 INCLUDE(${CREA_CMAKE_DIR}/CREAResolveOptions.cmake)
 
-SUBDIRS(cmake)
-SUBDIRS(src)
-SUBDIRS(appli)
-
 INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src)
 INCLUDE_DIRECTORIES(${PROJECT_BINARY_DIR}/src)
 
+ADD_SUBDIRECTORY(cmake)
+ADD_SUBDIRECTORY(src)
+ADD_SUBDIRECTORY(appli)
+
 #-----------------------------------------------------------------------------
 OPTION( BUILD_SAMPLES "Build samples ?" OFF)
 IF(BUILD_SAMPLES)
-  SUBDIRS(samples)
+  ADD_SUBDIRECTORY(samples)
 ENDIF(BUILD_SAMPLES)
 #-----------------------------------------------------------------------------
 
-SUBDIRS(install)
+ADD_SUBDIRECTORY(install)