Commit 644c2ccc authored by Jan Möbius's avatar Jan Möbius
Browse files

Dennis:

Updated cmake files



git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@6312 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 9adc3e8e
......@@ -5,7 +5,7 @@ macro (acg_modify_project_dirs)
if (WIN32)
add_definitions(
-D_USE_MATH_DEFINES -DNOMINMAX
-DOPENFLIPPER_APPDIR=".."
-DOPENFLIPPER_APPDIR="."
-DOPENFLIPPER_PLUGINDIR="${ACG_PROJECT_PLUGINDIR}"
-DOPENFLIPPER_DATADIR="${ACG_PROJECT_DATADIR}"
)
......
......@@ -98,12 +98,12 @@ if (WIN32)
if (EXISTS ${CMAKE_SOURCE_DIR}/WIN)
file (GLOB _files "${CMAKE_SOURCE_DIR}/WIN/DLLs/DLLs 32 debug/*.dll")
install(FILES ${_files}
DESTINATION ${ACG_PROJECT_LIBDIR}
DESTINATION ${ACG_PROJECT_BINDIR}
CONFIGURATIONS Debug
)
file (GLOB _files "${CMAKE_SOURCE_DIR}/WIN/DLLs/DLLs 32 release/*.dll")
install (FILES ${_files}
DESTINATION ${ACG_PROJECT_LIBDIR}
DESTINATION ${ACG_PROJECT_BINDIR}
CONFIGURATIONS Release
)
endif ()
......@@ -114,7 +114,15 @@ elseif (APPLE)
endif ()
# has to be last
include (InstallRequiredSystemLibraries)
if (WIN32)
set (CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP "true")
include (InstallRequiredSystemLibraries)
install (PROGRAMS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} DESTINATION ${ACG_PROJECT_BINDIR})
else ()
include (InstallRequiredSystemLibraries)
endif ()
include (CPack)
if (NOT WIN32 AND NOT APPLE)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment