fixed cmakelists

This commit is contained in:
Ulf Gebhardt 2017-07-27 13:51:04 +02:00
parent 9a2bf3c198
commit 8b9d3e410f
5 changed files with 20 additions and 6 deletions

View File

@ -1,6 +1,4 @@
add_subdirectory (dep)
add_subdirectory (shared)
add_subdirectory (Client)
if(BUILD_TOOLS)
add_subdirectory (tools)
endif()
add_subdirectory (tools)

View File

@ -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})

View File

@ -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()

View File

@ -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})

View File

@ -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})