fix cmake again

recipe/0001-Do-not-override-CXXFLAGS-for-the-libraries.patch

@@ -1,35 +1,55 @@
-From 315fc0a568b1066a83b1226ceeb59e783514baf8 Mon Sep 17 00:00:00 2001
+From 8669ffdd5e3a6e50d89e21ca1762a98a65166708 Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <[email protected]>
 Date: Mon, 25 Mar 2024 14:02:11 -0500
 Subject: [PATCH] Do not override CXXFLAGS for the libraries
 
 ---
- CMakeLists.txt | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
+ CMakeLists.txt | 13 +++++++++----
+ 1 file changed, 9 insertions(+), 4 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b06ac4575..a88f8114f 100644
+index b06ac4575..5068bc47e 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -278,13 +278,16 @@ ENDIF (MSVC)
+@@ -266,7 +266,7 @@ ENDIF(OPENMM_BUILD_C_AND_FORTRAN_WRAPPERS)
+
+ INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/src)
+
+-SET(EXTRA_LINK_FLAGS ${EXTRA_COMPILE_FLAGS})
++SET(EXTRA_LINK_FLAGS "${EXTRA_COMPILE_FLAGS}")
+ IF (CMAKE_SYSTEM_NAME MATCHES "Linux")
+     IF (NOT ANDROID)
+         SET(EXTRA_LINK_FLAGS "${EXTRA_LINK_FLAGS} -Wl,--no-as-needed -lrt")
+@@ -278,13 +278,18 @@ ENDIF (MSVC)
 
  IF(OPENMM_BUILD_SHARED_LIB)
      ADD_LIBRARY(${SHARED_TARGET} SHARED ${SOURCE_FILES} ${SOURCE_INCLUDE_FILES} ${API_ABS_INCLUDE_FILES})
 -    SET_TARGET_PROPERTIES(${SHARED_TARGET} PROPERTIES LINK_FLAGS "${EXTRA_LINK_FLAGS}" COMPILE_FLAGS "${EXTRA_COMPILE_FLAGS} -DOPENMM_BUILDING_SHARED_LIBRARY -DLEPTON_BUILDING_SHARED_LIBRARY -DPTHREAD_BUILDING_SHARED_LIBRARY" SOVERSION "${OPENMM_MAJOR_VERSION}.${OPENMM_MINOR_VERSION}")
 +    SET_TARGET_PROPERTIES(${SHARED_TARGET} PROPERTIES SOVERSION "${OPENMM_MAJOR_VERSION}.${OPENMM_MINOR_VERSION}")
 +    TARGET_LINK_OPTIONS(${SHARED_TARGET} PRIVATE ${EXTRA_LINK_FLAGS})
-+    TARGET_COMPILE_OPTIONS(${SHARED_TARGET} PRIVATE ${EXTRA_COMPILE_FLAGS} -DOPENMM_BUILDING_SHARED_LIBRARY -DLEPTON_BUILDING_SHARED_LIBRARY -DPTHREAD_BUILDING_SHARED_LIBRARY)
++    SET(EXTRA_COMPILE_FLAGS_SHARED "${EXTRA_COMPILE_FLAGS} -DOPENMM_BUILDING_SHARED_LIBRARY -DLEPTON_BUILDING_SHARED_LIBRARY -DPTHREAD_BUILDING_SHARED_LIBRARY")
++    TARGET_COMPILE_OPTIONS(${SHARED_TARGET} PRIVATE ${EXTRA_COMPILE_FLAGS_SHARED})
  ENDIF(OPENMM_BUILD_SHARED_LIB)
 
  IF(OPENMM_BUILD_STATIC_LIB)
      ADD_LIBRARY(${STATIC_TARGET} STATIC ${SOURCE_FILES} ${SOURCE_INCLUDE_FILES} ${API_ABS_INCLUDE_FILES})
      SET(EXTRA_COMPILE_FLAGS "${EXTRA_COMPILE_FLAGS} -DOPENMM_USE_STATIC_LIBRARIES -DLEPTON_USE_STATIC_LIBRARIES -DPTW32_STATIC_LIB")
 -    SET_TARGET_PROPERTIES(${STATIC_TARGET} PROPERTIES LINK_FLAGS "${EXTRA_LINK_FLAGS}" COMPILE_FLAGS "${EXTRA_COMPILE_FLAGS} -DOPENMM_BUILDING_STATIC_LIBRARY -DLEPTON_BUILDING_STATIC_LIBRARY -DPTHREAD_BUILDING_STATIC_LIBRARY")
++    SET(EXTRA_COMPILE_FLAGS_STATIC "${EXTRA_COMPILE_FLAGS} -DOPENMM_BUILDING_STATIC_LIBRARY -DLEPTON_BUILDING_STATIC_LIBRARY -DPTHREAD_BUILDING_STATIC_LIBRARY")
 +    TARGET_LINK_OPTIONS(${STATIC_TARGET} PRIVATE ${EXTRA_LINK_FLAGS})
-+    TARGET_COMPILE_OPTIONS(${STATIC_TARGET} PRIVATE ${EXTRA_COMPILE_FLAGS} -DOPENMM_BUILDING_STATIC_LIBRARY -DLEPTON_BUILDING_STATIC_LIBRARY -DPTHREAD_BUILDING_STATIC_LIBRARY)
++    TARGET_COMPILE_OPTIONS(${STATIC_TARGET} PRIVATE ${EXTRA_COMPILE_FLAGS_STATIC})
  ENDIF(OPENMM_BUILD_STATIC_LIB)
 
  IF(OPENMM_BUILD_C_AND_FORTRAN_WRAPPERS)
+@@ -454,7 +459,7 @@ ELSE (EXECUTABLE_OUTPUT_PATH)
+   SET (TEST_PATH .)
+ ENDIF (EXECUTABLE_OUTPUT_PATH)
+
+-ADD_SUBDIRECTORY(docs-source)
++#ADD_SUBDIRECTORY(docs-source)
+ IF(BUILD_TESTING)
+     ADD_SUBDIRECTORY(tests)
+ ENDIF(BUILD_TESTING)
 -- 
-2.42.0
+2.44.0