diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 57dae01..4254bc6 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,6 +1,4 @@ add_subdirectory (dep) add_subdirectory (shared) add_subdirectory (Client) -if(BUILD_TOOLS) - add_subdirectory (tools) -endif() \ No newline at end of file +add_subdirectory (tools) \ No newline at end of file diff --git a/src/Client/CMakeLists.txt b/src/Client/CMakeLists.txt index 8d674fe..4bf2e9f 100644 --- a/src/Client/CMakeLists.txt +++ b/src/Client/CMakeLists.txt @@ -61,5 +61,8 @@ target_link_libraries (pseuwow ${PSEUWOW_LIBS}) set_target_properties(pseuwow PROPERTIES LINK_FLAGS "${EXECUTABLE_LINK_FLAGS}" + RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_INSTALL_PREFIX}/bin" + RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_INSTALL_PREFIX}/bin" + VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_INSTALL_PREFIX}/bin" ) install(TARGETS pseuwow DESTINATION ${CMAKE_INSTALL_PREFIX}) diff --git a/src/dep/src/irrlicht/CMakeLists.txt b/src/dep/src/irrlicht/CMakeLists.txt index 21d350a..19dac83 100644 --- a/src/dep/src/irrlicht/CMakeLists.txt +++ b/src/dep/src/irrlicht/CMakeLists.txt @@ -327,7 +327,10 @@ additions/CImageLoaderBLP.cpp ${PROJECT_SOURCE_DIR}/src/Client/GUI/CM2Mesh.cpp ) if(WIN32) - SET_TARGET_PROPERTIES (irrlicht PROPERTIES DEFINE_SYMBOL "IRRLICHT_EXPORTS" ) + SET_TARGET_PROPERTIES (irrlicht PROPERTIES DEFINE_SYMBOL + "IRRLICHT_EXPORTS" + RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_INSTALL_PREFIX}/bin" + RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_INSTALL_PREFIX}/bin") target_link_libraries (irrlicht ${DirectX_D3D9_LIBRARY} ${DirectX_D3DX9_LIBRARY} Winmm) install(TARGETS irrlicht DESTINATION ${CMAKE_INSTALL_PREFIX}) # irrlicht needs to go to the install dir on windows as it's a dll endif() diff --git a/src/tools/stuffextract/CMakeLists.txt b/src/tools/stuffextract/CMakeLists.txt index f4f068c..47a9653 100644 --- a/src/tools/stuffextract/CMakeLists.txt +++ b/src/tools/stuffextract/CMakeLists.txt @@ -14,5 +14,10 @@ if(WIN32) endif() target_link_libraries (stuffextract ${STUFFEXTRACT_LIBS} ) - +set_target_properties (stuffextract PROPERTIES LINK_FLAGS + "${EXECUTABLE_LINK_FLAGS}" + RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_INSTALL_PREFIX}/bin" + RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_INSTALL_PREFIX}/bin" + VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_INSTALL_PREFIX}/bin" +) install(TARGETS stuffextract DESTINATION ${CMAKE_INSTALL_PREFIX}) diff --git a/src/tools/viewer/CMakeLists.txt b/src/tools/viewer/CMakeLists.txt index def2337..3933236 100644 --- a/src/tools/viewer/CMakeLists.txt +++ b/src/tools/viewer/CMakeLists.txt @@ -21,5 +21,10 @@ if(WIN32) endif() target_link_libraries (viewer ${VIEWER_LIBS} ) -set_target_properties (viewer PROPERTIES LINK_FLAGS "${EXECUTABLE_LINK_FLAGS}") +set_target_properties (viewer PROPERTIES LINK_FLAGS + "${EXECUTABLE_LINK_FLAGS}" + RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_INSTALL_PREFIX}/bin" + RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_INSTALL_PREFIX}/bin" + VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_INSTALL_PREFIX}/bin" +) install(TARGETS viewer DESTINATION ${CMAKE_INSTALL_PREFIX})