diff options
| author | Jaron Kent-Dobias <jaron@kent-dobias.com> | 2018-07-24 19:54:40 -0400 |
|---|---|---|
| committer | Jaron Kent-Dobias <jaron@kent-dobias.com> | 2018-07-24 19:54:40 -0400 |
| commit | 6ba067856523c481c2813f67f2d37414b739e3b1 (patch) | |
| tree | 608b842a8883b4de763bc9f7145d4ed73b70ae10 | |
| parent | 361ecc06948ccebb5bf4fe38bd9acb5f7531bcfa (diff) | |
| download | c++-6ba067856523c481c2813f67f2d37414b739e3b1.tar.gz c++-6ba067856523c481c2813f67f2d37414b739e3b1.tar.bz2 c++-6ba067856523c481c2813f67f2d37414b739e3b1.zip | |
cleaned up cmake
| -rw-r--r-- | CMakeLists.txt | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b391bba..bdfd181 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,6 +19,7 @@ add_executable(wolff_dgm src/wolff_dgm.cpp ${CPPSOURCES} ${CSOURCES}) add_executable(wolff_cgm src/wolff_cgm.cpp ${CPPSOURCES} ${CSOURCES}) add_executable(wolff_3potts src/wolff_potts.cpp ${CPPSOURCES} ${CSOURCES}) add_executable(wolff_4potts src/wolff_potts.cpp ${CPPSOURCES} ${CSOURCES}) +add_executable(wolff_7potts src/wolff_potts.cpp ${CPPSOURCES} ${CSOURCES}) add_executable(wolff_3clock src/wolff_clock.cpp ${CPPSOURCES} ${CSOURCES}) add_executable(wolff_5clock src/wolff_clock.cpp ${CPPSOURCES} ${CSOURCES}) add_executable(wolff_planar src/wolff_On.cpp ${CPPSOURCES} ${CSOURCES}) @@ -27,26 +28,28 @@ add_executable(analyze_correlations src/analyze_correlations.cpp ${CPPSOURCES} $ SET_TARGET_PROPERTIES(wolff_3potts PROPERTIES COMPILE_FLAGS "-DPOTTSQ=3") SET_TARGET_PROPERTIES(wolff_4potts PROPERTIES COMPILE_FLAGS "-DPOTTSQ=4") +SET_TARGET_PROPERTIES(wolff_7potts PROPERTIES COMPILE_FLAGS "-DPOTTSQ=7") SET_TARGET_PROPERTIES(wolff_3clock PROPERTIES COMPILE_FLAGS "-DPOTTSQ=3") SET_TARGET_PROPERTIES(wolff_5clock PROPERTIES COMPILE_FLAGS "-DPOTTSQ=5") SET_TARGET_PROPERTIES(wolff_planar PROPERTIES COMPILE_FLAGS "-DN_COMP=2") SET_TARGET_PROPERTIES(wolff_heisenberg PROPERTIES COMPILE_FLAGS "-DN_COMP=3") -find_library(GSL NAMES gsl) -find_library(FFTW NAMES fftw3) -find_library(M NAMES m) +find_library(GSL REQUIRED NAMES gsl) +find_library(FFTW REQUIRED NAMES fftw3) +find_library(M REQUIRED NAMES m) FIND_LIBRARY(GL NAMES GL) FIND_LIBRARY(GLU NAMES GLU) FIND_LIBRARY(GLUT NAMES glut) -FIND_LIBRARY(TESTING NAMES Idontexist) target_link_libraries(analyze_correlations cblas gsl fftw3 m) + if (${GLUT} MATCHES "GLUT-NOTFOUND") target_link_libraries(wolff_ising cblas gsl m) target_link_libraries(wolff_dgm cblas gsl m) target_link_libraries(wolff_cgm cblas gsl m) target_link_libraries(wolff_3potts cblas gsl m) target_link_libraries(wolff_4potts cblas gsl m) + target_link_libraries(wolff_7potts cblas gsl m) target_link_libraries(wolff_3clock cblas gsl m) target_link_libraries(wolff_5clock cblas gsl m) target_link_libraries(wolff_heisenberg cblas gsl m) @@ -57,6 +60,7 @@ else() target_link_libraries(wolff_cgm cblas gsl m glut GL GLU) target_link_libraries(wolff_3potts cblas gsl m glut GL GLU) target_link_libraries(wolff_4potts cblas gsl m glut GL GLU) + target_link_libraries(wolff_7potts cblas gsl m glut GL GLU) target_link_libraries(wolff_3clock cblas gsl m glut GL GLU) target_link_libraries(wolff_5clock cblas gsl m glut GL GLU) target_link_libraries(wolff_heisenberg cblas gsl m glut GL GLU) @@ -65,9 +69,10 @@ else() target_compile_definitions(wolff_dgm PUBLIC HAVE_GLUT) target_compile_definitions(wolff_cgm PUBLIC HAVE_GLUT) target_compile_definitions(wolff_3potts PUBLIC HAVE_GLUT) + target_compile_definitions(wolff_4potts PUBLIC HAVE_GLUT) + target_compile_definitions(wolff_7potts PUBLIC HAVE_GLUT) target_compile_definitions(wolff_3clock PUBLIC HAVE_GLUT) target_compile_definitions(wolff_5clock PUBLIC HAVE_GLUT) - target_compile_definitions(wolff_4potts PUBLIC HAVE_GLUT) target_compile_definitions(wolff_planar PUBLIC HAVE_GLUT) target_compile_definitions(wolff_heisenberg PUBLIC HAVE_GLUT) endif() |