diff --git a/Apps/CMakeLists.txt b/Apps/CMakeLists.txt index ce952fd695ce6d77d460080789cf92ab8bd5c96d..7b0357bc4917a6198b5443ad6e6e016556f24586 100644 --- a/Apps/CMakeLists.txt +++ b/Apps/CMakeLists.txt @@ -7,9 +7,14 @@ ENDIF () IF (WIN32) - link_directories( ${CGoGN_ROOT_DIR}/lib/${ConfigurationName}) link_directories( ${CGoGN_ROOT_DIR}/windows_dependencies/lib/) - SET(EXECUTABLE_OUTPUT_PATH ${CGoGN_ROOT_DIR}/bin/) # Release/Debug added automatically by visual + IF((CGoGN_WITH_QTCREATOR)) + link_directories( ${CGoGN_ROOT_DIR}/lib/${CMAKE_BUILD_TYPE}) + SET(EXECUTABLE_OUTPUT_PATH ${CGoGN_ROOT_DIR}/bin/${CMAKE_BUILD_TYPE}) # Release/Debug added automatically by visual + ELSE() + link_directories( ${CGoGN_ROOT_DIR}/lib/${ConfigurationName}) + SET(EXECUTABLE_OUTPUT_PATH ${CGoGN_ROOT_DIR}/bin/) # Release/Debug added automatically by visual + ENDIF() ELSE() link_directories( ${CGoGN_ROOT_DIR}/lib/${CMAKE_BUILD_TYPE} ) SET(EXECUTABLE_OUTPUT_PATH ${CGoGN_ROOT_DIR}/bin/${CMAKE_BUILD_TYPE} ) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2688b10dec133f438c1c5dc2c5182fd0fbe4aebf..af6ea8ee865219b2a08232dd99cec571b6c7a89e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,6 +33,7 @@ IF (WIN32) SET ( BUILD_SHARED_LIBS OFF CACHE BOOL "if used all library are build as shared type (.so/.dylib/.dll)" ) SET ( CMAKE_CONFIGURATION_TYPES Release Debug) SET ( CMAKE_CONFIGURATION_TYPES "${CMAKE_CONFIGURATION_TYPES}" CACHE STRING "Only Release or Debug" FORCE) + SET ( CGoGN_WITH_QTCREATOR OFF CACHE BOOL "use QtCreator to compile" ) ELSE (WIN32) SET ( BUILD_SHARED_LIBS ON CACHE BOOL "if used all library are build as shared type (.so/.dylib/.dll)" ) ENDIF () @@ -43,7 +44,7 @@ setBuildType() SET(EXECUTABLE_OUTPUT_PATH ${CGoGN_ROOT_DIR}/bin/) -IF(WIN32) +IF(WIN32 AND (NOT CGoGN_WITH_QTCREATOR)) SET(LIBRARY_OUTPUT_PATH ${CGoGN_ROOT_DIR}/lib) ELSE() SET(LIBRARY_OUTPUT_PATH ${CGoGN_ROOT_DIR}/lib/${CMAKE_BUILD_TYPE})