##// END OF EJS Templates
GIT_REPOSITORIES » LPP » Users » mperrinel » SCIQLOP-Initialisation
RSS

Fork of HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop

Mise à jour du cmake pour qu'il n'utilise plus les CXX_FLAGS avec un...
mperrinel -
r17:d164eec363a1
parent child
Show More
Show file before | Show file after | Hide comments
@@ -2,13 +2,13
2 2 # compiler.cmake : configure the compilation flags
3 3 #
4 4
5 message("Compiler id: ${CMAKE_CXX_COMPILER_ID}")
5 message("Compiler id: ${CMAKE_CXX_COMPILER_ID}")
6 6 IF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
7 INCLUDE("cmake/compiler/compiler_gnu.cmake")
7 MESSAGE("Compiler supported")
8 8 ELSEIF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
9 INCLUDE("cmake/compiler/compiler_gnu.cmake")
9 MESSAGE("Compiler supported")
10 10 ELSEIF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
11 INCLUDE("cmake/compiler/compiler_msvc.cmake")
11 INCLUDE("cmake/compiler/compiler_msvc.cmake")
12 12 ELSE()
13 13 MESSAGE(FATAL_ERROR "Compiler not supported")
14 14 ENDIF()
Show file before | Show file after | Hide comments
@@ -59,6 +59,9 QT5_WRAP_UI(UIS_HDRS
59 59
60 60
61 61 ADD_EXECUTABLE(${EXECUTABLE_NAME} ${APPLICATION_SOURCES} ${RCC_HDRS} ${UIS_HDRS})
62 set_property(TARGET ${EXECUTABLE_NAME} PROPERTY CXX_STANDARD 14)
63 set_property(TARGET ${EXECUTABLE_NAME} PROPERTY CXX_STANDARD_REQUIRED ON)
64
62 65 target_link_libraries(${EXECUTABLE_NAME}
63 66 ${LIBRARIES})
64 67
Show file before | Show file after | Hide comments
@@ -27,6 +27,8 FILE (GLOB_RECURSE MODULE_SOURCES
27 27 ${SOURCES_DIR}/*.h)
28 28
29 29 ADD_LIBRARY(${SQPCORE_LIBRARY_NAME} ${MODULE_SOURCES})
30 set_property(TARGET ${SQPCORE_LIBRARY_NAME} PROPERTY CXX_STANDARD 14)
31 set_property(TARGET ${SQPCORE_LIBRARY_NAME} PROPERTY CXX_STANDARD_REQUIRED ON)
30 32 TARGET_LINK_LIBRARIES(${SQPCORE_LIBRARY_NAME} ${EXTERN_LIBRARIES})
31 33 qt5_use_modules(${SQPCORE_LIBRARY_NAME} Core)
32 34
Show file before | Show file after | Hide comments
@@ -44,6 +44,8 include_directories("${CMAKE_CURRENT_BINARY_DIR}")
44 44 message(CURRENT INCLUDE : ${CMAKE_CURRENT_BINARY_DIR})
45 45
46 46 ADD_LIBRARY(${SQPGUI_LIBRARY_NAME} ${MODULE_SOURCES} ${UIS_HDRS})
47 set_property(TARGET ${SQPGUI_LIBRARY_NAME} PROPERTY CXX_STANDARD 14)
48 set_property(TARGET ${SQPGUI_LIBRARY_NAME} PROPERTY CXX_STANDARD_REQUIRED ON)
47 49 TARGET_LINK_LIBRARIES(${SQPGUI_LIBRARY_NAME} ${EXTERN_LIBRARIES})
48 50 qt5_use_modules(${SQPGUI_LIBRARY_NAME} Core Widgets)
49 51
Show file before | Show file after | Hide comments
1 NO CONTENT: file was removed
General Comments 0
You need to be logged in to leave comments. Login now