diff options
| author | Cedric Nugteren <web@cedricnugteren.nl> | 2016-10-23 14:34:46 +0200 |
|---|---|---|
| committer | Cedric Nugteren <web@cedricnugteren.nl> | 2016-10-23 14:34:46 +0200 |
| commit | fda39ffd86b1bb7cfb9d62947aedc0cdbc20f8e2 (patch) | |
| tree | bc8350dabaab52be6380d4d256c6f98b4ae715c3 | |
| parent | de0420dffa0dc1bcdad308e24224ad6378418d67 (diff) | |
Fixed the CMakeLists.txt for Visual Studio compilation
| -rw-r--r-- | CMakeLists.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f79c9121..f5edbd75 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -275,7 +275,7 @@ if(TUNERS) # Visual Studio requires the sources of non-exported objects/libraries set(TUNERS_COMMON ) if(MSVC) - set(TUNERS_COMMON ${TUNERS_COMMON} src/utilities.cpp) + set(TUNERS_COMMON ${TUNERS_COMMON} src/utilities/utilities.cpp) endif() # Adds tuning executables @@ -311,7 +311,7 @@ if(CLIENTS OR TESTS) find_package(Threads) set(REF_LIBRARIES ${REF_LIBRARIES} ${CLBLAS_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) set(REF_INCLUDES ${REF_INCLUDES} ${CLBLAS_INCLUDE_DIRS}) - if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + if(MSVC) add_definitions(" /DCLBLAST_REF_CLBLAS") else() add_definitions(" -DCLBLAST_REF_CLBLAS") @@ -320,7 +320,7 @@ if(CLIENTS OR TESTS) if(CBLAS_FOUND) set(REF_INCLUDES ${REF_INCLUDES} ${CBLAS_INCLUDE_DIRS}) set(REF_LIBRARIES ${REF_LIBRARIES} ${CBLAS_LIBRARIES}) - if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + if(MSVC) add_definitions(" /DCLBLAST_REF_CBLAS") else() add_definitions(" -DCLBLAST_REF_CBLAS") @@ -338,7 +338,7 @@ if(CLIENTS) # Visual Studio requires the sources of non-exported objects/libraries set(CLIENTS_COMMON ) if(MSVC) - set(CLIENTS_COMMON ${CLIENTS_COMMON} src/utilities.cpp test/performance/client.cpp) + set(CLIENTS_COMMON ${CLIENTS_COMMON} src/utilities/utilities.cpp test/performance/client.cpp) else() # Creates the common performance-tests objects (requires CMake 2.8.8) add_library(test_performance_common OBJECT test/performance/client.cpp) @@ -385,7 +385,7 @@ if(TESTS) # Visual Studio requires the sources of non-exported objects/libraries set(TESTS_COMMON ) if(MSVC) - set(TESTS_COMMON ${TESTS_COMMON} src/utilities.cpp + set(TESTS_COMMON ${TESTS_COMMON} src/utilities/utilities.cpp test/correctness/tester.cpp test/correctness/testblas.cpp) else() # Creates the common correctness-tests objects (requires CMake 2.8.8) |