Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 4ec66541 authored by Mathieu Faverge's avatar Mathieu Faverge
Browse files

Merge branch 'prevent_semicolon_in_cmake_flags' into 'master'

CMAKE flags are used in check function exists, we should replace semicolons as soon as possible

See merge request solverstack/chameleon!105
parents c504ac73 3537d437
No related branches found
No related tags found
No related merge requests found
...@@ -311,9 +311,11 @@ if(NOT CHAMELEON_SIMULATION) ...@@ -311,9 +311,11 @@ if(NOT CHAMELEON_SIMULATION)
endif() endif()
if(CBLAS_CFLAGS_OTHER_DEP) if(CBLAS_CFLAGS_OTHER_DEP)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CBLAS_CFLAGS_OTHER_DEP}") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CBLAS_CFLAGS_OTHER_DEP}")
string(REPLACE ";" " " CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
endif() endif()
if(CBLAS_LDFLAGS_OTHER_DEP) if(CBLAS_LDFLAGS_OTHER_DEP)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${CBLAS_LDFLAGS_OTHER_DEP}") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${CBLAS_LDFLAGS_OTHER_DEP}")
string(REPLACE ";" " " CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}")
endif() endif()
if(CBLAS_LIBRARY_DIRS_DEP) if(CBLAS_LIBRARY_DIRS_DEP)
list(APPEND CMAKE_INSTALL_RPATH "${CBLAS_LIBRARY_DIRS_DEP}") list(APPEND CMAKE_INSTALL_RPATH "${CBLAS_LIBRARY_DIRS_DEP}")
...@@ -347,9 +349,11 @@ if(NOT CHAMELEON_SIMULATION) ...@@ -347,9 +349,11 @@ if(NOT CHAMELEON_SIMULATION)
endif() endif()
if(LAPACKE_CFLAGS_OTHER_DEP) if(LAPACKE_CFLAGS_OTHER_DEP)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${LAPACKE_CFLAGS_OTHER_DEP}") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${LAPACKE_CFLAGS_OTHER_DEP}")
string(REPLACE ";" " " CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
endif() endif()
if(LAPACKE_LDFLAGS_OTHER_DEP) if(LAPACKE_LDFLAGS_OTHER_DEP)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LAPACKE_LDFLAGS_OTHER_DEP}") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LAPACKE_LDFLAGS_OTHER_DEP}")
string(REPLACE ";" " " CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}")
endif() endif()
if(LAPACKE_LIBRARY_DIRS_DEP) if(LAPACKE_LIBRARY_DIRS_DEP)
list(APPEND CMAKE_INSTALL_RPATH "${LAPACKE_LIBRARY_DIRS_DEP}") list(APPEND CMAKE_INSTALL_RPATH "${LAPACKE_LIBRARY_DIRS_DEP}")
...@@ -451,9 +455,11 @@ if(NOT CHAMELEON_SIMULATION) ...@@ -451,9 +455,11 @@ if(NOT CHAMELEON_SIMULATION)
#list(APPEND MPI_COMPILE_FLAGS "-mt_mpi") #list(APPEND MPI_COMPILE_FLAGS "-mt_mpi")
if(MPI_C_COMPILE_FLAGS) if(MPI_C_COMPILE_FLAGS)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MPI_C_COMPILE_FLAGS}") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MPI_C_COMPILE_FLAGS}")
string(REPLACE ";" " " CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
endif() endif()
if(MPI_C_LINK_FLAGS) if(MPI_C_LINK_FLAGS)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${MPI_C_LINK_FLAGS}") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${MPI_C_LINK_FLAGS}")
string(REPLACE ";" " " CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}")
endif() endif()
endif (MPI_C_FOUND) endif (MPI_C_FOUND)
...@@ -553,9 +559,11 @@ else (NOT CHAMELEON_SIMULATION) ...@@ -553,9 +559,11 @@ else (NOT CHAMELEON_SIMULATION)
include_directories( ${MPI_C_INCLUDE_PATH} ) include_directories( ${MPI_C_INCLUDE_PATH} )
if(MPI_C_COMPILE_FLAGS) if(MPI_C_COMPILE_FLAGS)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MPI_C_COMPILE_FLAGS}") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MPI_C_COMPILE_FLAGS}")
string(REPLACE ";" " " CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
endif() endif()
if(MPI_C_LINK_FLAGS) if(MPI_C_LINK_FLAGS)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${MPI_C_LINK_FLAGS}") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${MPI_C_LINK_FLAGS}")
string(REPLACE ";" " " CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}")
endif() endif()
endif (MPI_C_FOUND) endif (MPI_C_FOUND)
...@@ -599,10 +607,12 @@ if( CHAMELEON_SCHED_STARPU ) ...@@ -599,10 +607,12 @@ if( CHAMELEON_SCHED_STARPU )
endif() endif()
if(STARPU_CFLAGS_OTHER_DEP) if(STARPU_CFLAGS_OTHER_DEP)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${STARPU_CFLAGS_OTHER_DEP}") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${STARPU_CFLAGS_OTHER_DEP}")
string(REPLACE ";" " " CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
set(CMAKE_REQUIRED_FLAGS "${STARPU_CFLAGS_OTHER_DEP}") set(CMAKE_REQUIRED_FLAGS "${STARPU_CFLAGS_OTHER_DEP}")
endif() endif()
if(STARPU_LDFLAGS_OTHER_DEP) if(STARPU_LDFLAGS_OTHER_DEP)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${STARPU_LDFLAGS_OTHER_DEP}") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${STARPU_LDFLAGS_OTHER_DEP}")
string(REPLACE ";" " " CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}")
set(CMAKE_REQUIRED_LDFLAGS "${STARPU_LDFLAGS_OTHER_DEP}") set(CMAKE_REQUIRED_LDFLAGS "${STARPU_LDFLAGS_OTHER_DEP}")
endif() endif()
if(STARPU_LIBRARY_DIRS_DEP) if(STARPU_LIBRARY_DIRS_DEP)
...@@ -760,9 +770,11 @@ if( CHAMELEON_SCHED_PARSEC ) ...@@ -760,9 +770,11 @@ if( CHAMELEON_SCHED_PARSEC )
endif() endif()
if(PARSEC_CFLAGS_OTHER_DEP) if(PARSEC_CFLAGS_OTHER_DEP)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${PARSEC_CFLAGS_OTHER_DEP}") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${PARSEC_CFLAGS_OTHER_DEP}")
string(REPLACE ";" " " CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
endif() endif()
if(PARSEC_LDFLAGS_OTHER_DEP) if(PARSEC_LDFLAGS_OTHER_DEP)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${PARSEC_LDFLAGS_OTHER_DEP}") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${PARSEC_LDFLAGS_OTHER_DEP}")
string(REPLACE ";" " " CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}")
endif() endif()
if(PARSEC_LIBRARY_DIRS_DEP) if(PARSEC_LIBRARY_DIRS_DEP)
list(APPEND CMAKE_INSTALL_RPATH "${PARSEC_LIBRARY_DIRS_DEP}") list(APPEND CMAKE_INSTALL_RPATH "${PARSEC_LIBRARY_DIRS_DEP}")
...@@ -829,9 +841,11 @@ if( CHAMELEON_SCHED_QUARK ) ...@@ -829,9 +841,11 @@ if( CHAMELEON_SCHED_QUARK )
endif() endif()
if(QUARK_CFLAGS_OTHER_DEP) if(QUARK_CFLAGS_OTHER_DEP)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${QUARK_CFLAGS_OTHER_DEP}") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${QUARK_CFLAGS_OTHER_DEP}")
string(REPLACE ";" " " CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
endif() endif()
if(QUARK_LDFLAGS_OTHER_DEP) if(QUARK_LDFLAGS_OTHER_DEP)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${QUARK_LDFLAGS_OTHER_DEP}") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${QUARK_LDFLAGS_OTHER_DEP}")
string(REPLACE ";" " " CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}")
endif() endif()
if(QUARK_LIBRARY_DIRS_DEP) if(QUARK_LIBRARY_DIRS_DEP)
list(APPEND CMAKE_INSTALL_RPATH "${QUARK_LIBRARY_DIRS_DEP}") list(APPEND CMAKE_INSTALL_RPATH "${QUARK_LIBRARY_DIRS_DEP}")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment