|
@@ -16,7 +16,7 @@ if (MSVC)
|
|
add_definitions(-DUNICODE -D_UNICODE)
|
|
add_definitions(-DUNICODE -D_UNICODE)
|
|
endif()
|
|
endif()
|
|
|
|
|
|
-set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/other/cmake ${CMAKE_MODULE_PATH})
|
|
|
|
|
|
+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/other/cmake ${CMAKE_MODULE_PATH})
|
|
|
|
|
|
if (CMAKE_VERSION VERSION_LESS "3.1")
|
|
if (CMAKE_VERSION VERSION_LESS "3.1")
|
|
set (CMAKE_C_FLAGS "-std=c11 ${CMAKE_C_FLAGS}")
|
|
set (CMAKE_C_FLAGS "-std=c11 ${CMAKE_C_FLAGS}")
|
|
@@ -26,7 +26,7 @@ endif ()
|
|
|
|
|
|
# put output in "bin"
|
|
# put output in "bin"
|
|
|
|
|
|
-set(OUTPUT_DIR ${CMAKE_SOURCE_DIR}/bin)
|
|
|
|
|
|
+set(OUTPUT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/bin)
|
|
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${OUTPUT_DIR})
|
|
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${OUTPUT_DIR})
|
|
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_DIR})
|
|
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_DIR})
|
|
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${OUTPUT_DIR})
|
|
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${OUTPUT_DIR})
|