diff --git a/CMakeLists.txt b/CMakeLists.txt index d0e6e0a..0f1f38d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,16 +11,6 @@ else(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") add_definitions(-D_CRT_SECURE_NO_WARNINGS) endif() -if( CMAKE_SIZEOF_VOID_P EQUAL 8 ) - MESSAGE( "64 bits compiler detected" ) - SET( EX_PLATFORM 64 ) - SET( EX_PLATFORM_NAME "x64" ) -else( CMAKE_SIZEOF_VOID_P EQUAL 8 ) - MESSAGE( "32 bits compiler detected" ) - SET( EX_PLATFORM 32 ) - SET( EX_PLATFORM_NAME "x86" ) -endif( CMAKE_SIZEOF_VOID_P EQUAL 8 ) - if (NOT WIN32 AND NOT ANDROID) set(CMAKE_CXX_COMPILER "clang++") endif() @@ -155,15 +145,15 @@ PROPERTIES # ) install(TARGETS kraken - RUNTIME DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/export/${CMAKE_BUILD_TYPE}/bin/win${EX_PLATFORM} + RUNTIME DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/export/${CMAKE_BUILD_TYPE}/bin/win PUBLIC_HEADER DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/export/include - ARCHIVE DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/export/${CMAKE_BUILD_TYPE}/lib/win${EX_PLATFORM} - LIBRARY DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/export/${CMAKE_BUILD_TYPE}/lib/win${EX_PLATFORM} + ARCHIVE DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/export/${CMAKE_BUILD_TYPE}/lib/win + LIBRARY DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/export/${CMAKE_BUILD_TYPE}/lib/win ) IF(CMAKE_BUILD_TYPE MATCHES DEBUG) install (FILES $ - DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/export/lib/win${EX_PLATFORM}) + DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/export/lib/win) ENDIF(CMAKE_BUILD_TYPE MATCHES DEBUG) add_subdirectory(tests) diff --git a/build_win64.bat b/build_win64.bat new file mode 100644 index 0000000..4739fd4 --- /dev/null +++ b/build_win64.bat @@ -0,0 +1,2 @@ +rem call "%VSINSTALLDIR%VC\Auxiliary\Build\vcvars64.bat" +cmake -H. -G Ninja -Bbuild -DCMAKE_TOOLCHAIN_FILE="tools/toolchain-x86_64-pc-windows-msvc.cmake" \ No newline at end of file diff --git a/tools/toolchain-x86_64-pc-windows-msvc.cmake b/tools/toolchain-x86_64-pc-windows-msvc.cmake new file mode 100644 index 0000000..af5d68d --- /dev/null +++ b/tools/toolchain-x86_64-pc-windows-msvc.cmake @@ -0,0 +1,13 @@ +set(triple x86_64-pc-windows-msvc) +set(CMAKE_C_COMPILER_TARGET "${LLVM_DEFAULT_TARGET_TRIPLE}" CACHE STRING "") +set(CMAKE_CXX_COMPILER_TARGET "${LLVM_DEFAULT_TARGET_TRIPLE}" CACHE STRING "") + +set(CMAKE_C_COMPILER clang-cl) +set(CMAKE_C_COMPILER_TARGET ${triple}) +set(CMAKE_CXX_COMPILER clang-cl) +set(CMAKE_CXX_COMPILER_TARGET ${triple}) +set(CMAKE_C_FLAGS -m64) +set(CMAKE_CXX_FLAGS -m64) + + +# C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build>vcvars64.bat